bitkeeper revision 1.1159.187.24 (41a8a1cfEx5fQ9XNJg_Yxyv0C74XUA)

Fix stack padding in failsafe callback. Remove an erroneous asm comment.

diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
index f19fd7a473a1216b0f4d6cc836c3ed0519712a93..e8cc2505938ea6f3e89f345274bf26b28870540b 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
@@ -323,7 +323,7 @@ resume_vm86:
        RESTORE_REGS
        movl %eax,(%esp)
        movl $__HYPERVISOR_switch_vm86,%eax
-       int $0x82                       # Atomically enables events delivery
+       int $0x82
        ud2
 
        # perform work that needs to be done immediately before resumption
@@ -555,7 +555,8 @@ ENTRY(failsafe_callback)
 1:      popl %ds
 2:      popl %es
 3:      popl %fs
-4:      popl %gs
+4:      pop  %gs
+        subl $4,%esp
         SAVE_ALL
         jmp  ret_from_exception
 .section .fixup,"ax";  \